From 82a6dc936528d482fe3878c6f87a1186dfb186d3 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 14 Nov 2001 20:20:03 +0000 Subject: [PATCH] Back out accidental commit of debugging timing code Wed Nov 14 15:14:48 2001 Owen Taylor * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back out accidental commit of debugging timing code --- ChangeLog | 5 ++++ ChangeLog.pre-2-0 | 5 ++++ ChangeLog.pre-2-10 | 5 ++++ ChangeLog.pre-2-2 | 5 ++++ ChangeLog.pre-2-4 | 5 ++++ ChangeLog.pre-2-6 | 5 ++++ ChangeLog.pre-2-8 | 5 ++++ gtk/gtkcontainer.c | 62 ++++++++++++++++------------------------------ 8 files changed, 56 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82a7066bbf..504d6fbc8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 14 15:14:48 2001 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back + out accidental commit of debugging timing code. + 2001-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 82a7066bbf..504d6fbc8c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Nov 14 15:14:48 2001 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back + out accidental commit of debugging timing code. + 2001-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 82a7066bbf..504d6fbc8c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Nov 14 15:14:48 2001 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back + out accidental commit of debugging timing code. + 2001-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 82a7066bbf..504d6fbc8c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Nov 14 15:14:48 2001 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back + out accidental commit of debugging timing code. + 2001-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 82a7066bbf..504d6fbc8c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Nov 14 15:14:48 2001 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back + out accidental commit of debugging timing code. + 2001-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 82a7066bbf..504d6fbc8c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Nov 14 15:14:48 2001 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back + out accidental commit of debugging timing code. + 2001-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 82a7066bbf..504d6fbc8c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Nov 14 15:14:48 2001 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back + out accidental commit of debugging timing code. + 2001-11-14 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 12915fa21b..279ff7bc1f 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -966,52 +966,32 @@ gtk_container_get_resize_container (GtkContainer *container) static gboolean gtk_container_idle_sizer (gpointer data) { - static gboolean initialized = 0; - static GTimeVal last_time; - GTimeVal current_time; - GDK_THREADS_ENTER (); - if (container_resize_queue) + /* we may be invoked with a container_resize_queue of NULL, because + * queue_resize could have been adding an extra idle function while + * the queue still got processed. we better just ignore such case + * than trying to explicitely work around them with some extra flags, + * since it doesn't cause any actual harm. + */ + while (container_resize_queue) { - /* we may be invoked with a container_resize_queue of NULL, because - * queue_resize could have been adding an extra idle function while - * the queue still got processed. we better just ignore such case - * than trying to explicitely work around them with some extra flags, - * since it doesn't cause any actual harm. - */ - while (container_resize_queue) - { - GSList *slist; - GtkWidget *widget; - - slist = container_resize_queue; - container_resize_queue = slist->next; - widget = slist->data; - g_slist_free_1 (slist); - - GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING); - gtk_container_check_resize (GTK_CONTAINER (widget)); - } - - gdk_window_process_all_updates (); - - g_get_current_time (¤t_time); - - if (initialized) - { - gdouble diff = ((current_time.tv_usec - last_time.tv_usec) / 1000. + - (current_time.tv_sec - last_time.tv_sec) * 1000.); - /* g_print ("Frame time: %g msec\n", diff); */ - } - else - initialized = TRUE; - - last_time = current_time; - - GDK_THREADS_LEAVE (); + GSList *slist; + GtkWidget *widget; + + slist = container_resize_queue; + container_resize_queue = slist->next; + widget = slist->data; + g_slist_free_1 (slist); + + GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING); + gtk_container_check_resize (GTK_CONTAINER (widget)); } + gdk_window_process_all_updates (); + + GDK_THREADS_LEAVE (); + return FALSE; } -- 2.30.2